Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: use new and improved ff-ap-timer #354

Merged
merged 2 commits into from
Jan 5, 2024

Conversation

grische
Copy link
Contributor

@grische grische commented Jan 4, 2024

No description provided.

@grische grische added gluon-v2023.1.x backport gluon-v2021.1.x Backport to 4/32 Branch backport gluon-v2023.2.x Backport to Gluon v2023.2.x Branch labels Jan 4, 2024
@grische grische marked this pull request as ready for review January 4, 2024 23:42
@grische grische requested review from maurerle and a team as code owners January 4, 2024 23:42
@grische grische merged commit 2986c92 into freifunkMUC:stable Jan 5, 2024
28 checks passed
Copy link
Contributor

github-actions bot commented Jan 5, 2024

Backport failed for legacy, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin legacy
git worktree add -d .worktree/backport-354-to-legacy origin/legacy
cd .worktree/backport-354-to-legacy
git checkout -b backport-354-to-legacy
ancref=$(git merge-base b80fb965167ab9e117616375f291247a2dca1d47 e897b3c3f669461d9bf72b3613e9c86a5f41ec6a)
git cherry-pick -x $ancref..e897b3c3f669461d9bf72b3613e9c86a5f41ec6a

Copy link
Contributor

github-actions bot commented Jan 5, 2024

Successfully created backport PR for next:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport gluon-v2021.1.x Backport to 4/32 Branch backport gluon-v2023.2.x Backport to Gluon v2023.2.x Branch gluon-v2023.1.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants